Partially revert broadcast-join change #20779
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rjzamora
added
3 - Ready for Review
github-actions
bot
added
Python
rjzamora
commented
Dec 3, 2025
Member
Author
There was a problem hiding this comment.
All changes to this file are directly reverting #20724
rjzamora
commented
Dec 3, 2025
Comment on lines
-159
to
+172
| small_df = _concat( | ||
| *await get_small_table(context, small_child, small_ch), | ||
| context=ir_context, | ||
| ) | ||
| if context.comm().nranks > 1 and not small_duplicated: | ||
| small_dfs, small_size = await get_small_table(context, small_child, small_ch) | ||
| need_allgather = context.comm().nranks > 1 and not small_duplicated | ||
| if ( | ||
| ir.options[0] != "Inner" or small_size < target_partition_size | ||
| ) and not need_allgather: | ||
| # Pre-concat for non-inner joins, otherwise | ||
| # we need a local shuffle, and face additional | ||
| # memory pressure anyway. | ||
| small_dfs = [_concat(*small_dfs, context=ir_context)] |
Member
Author
There was a problem hiding this comment.
Before #20724, we were only pre-concatenating for non-inner joins (to avoid the extra local shuffle).
After #20724, we were always pre-concatenating.
Now, we pre-concatenate when it makes sense:
- To avoid the local shuffle (e.g. non-inner joins)
- We have small data
- We aren't already concatenating via an allgather
TomAugspurger
approved these changes
Dec 4, 2025
Contributor
TomAugspurger
left a comment
TomAugspurger
left a comment
There was a problem hiding this comment.
One question about ordering.
rjzamora
commented
Dec 4, 2025
rjzamora
added
5 - Ready to Merge
Member
Author
|
/merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Checklist